Reapply fixed squashed update from 3.4.47 to 3.4.48