Backport #663 from 26a619cc255932ea20cd0fc0c8382895a4b15c25
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
Backport #663 from 26a619cc255932ea20cd0fc0c8382895a4b15c25
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.