Fixed on pre-release branch via check-in [4c89b317dd].