Fix for W-1785931
Merging origin/skhan/master-pending-W1785931 into master