**** Merged r36893 from MCS ****