Pull miscellaneous into release branch