Pull 5283 into release branch