Merge changes from topic 'am-47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus...