Automation for W-2329688

@rev fabbott@
@bug W-2329688@
Merging origin/rshah/master-pending-W-2329688Automation into master