Pull 5571 into release branch