Backports #245 from 28e3d47a54c4fe1ce0a3647c872411602dc6b1e2
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
Backports #245 from 28e3d47a54c4fe1ce0a3647c872411602dc6b1e2
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.