**** Merged r47034 from MCS ****