Pull 5165 into release branch