Automation for W-1766830 and fix for W-1793166
Merging origin/skhan/master-pending-W1766830 into master