**** Merged r37880 from MCS ****