Merge fix for 4660 back to 26 maint
4 files changed