Pull bug3410 into release branch