Pull misc into release branch