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