Automation for fix of W-1708983
Merging origin/skhan/patch-pending-W1708983 into 186/patch