Merge remote-tracking branch 'wjt/arg0namespace' into arg0namespace-24317