**** Merged r40732-r40872 from MCS ****