**** Merged r45430 from GMCS ****