**** Merged r40457-r40460 from MCS ****