Rolling in changes from RR 2.5.3

Nothing too fancy, although we're still slightly ahead of the stable once this build is done.