Pull 3410 into release branch