**** Merged r37687-r37734 from MCS ****