**** Merged r40513 from MCS ****