Pull misc-for-upstream into release branch