Pull 5221 into release branch