Merge pull request #13745 from mehrdada/upmerge180

Upmerge v1.8.x into master