Backporting #1027 from 5d5c6b5f09d25765683c23b081511331c2115bab
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.
Description
Backporting #1027 from 5d5c6b5f09d25765683c23b081511331c2115bab
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.