Merge "Bump version to 2.9.2" into stable-2.9