Backport the fixes for changing branch / major upgrade to 9.2