Applying BR#9269 patch to 2.0 development.