Apply changes from r3542 to release branch