Pull 5452 into release branch