Blocking 47576 from merging into trunk. Already done in 47577