Merge branch 'arg0namespace-24317'