Updated for auto testing Refs #29911
Autotagging - Merge branch 'master' into deployment.client.beta