Squashed update from 3.4.48 to 3.4.49, original commit: 3395b043af4e421a9f0c515d5bb7b57902fbe9b2