**** Merged r45574 from MCS ****