Merge pull request #15374 from mehrdada/v1.12.x

Bump v1.12.x to v1.12.0