Backport #697 to 2.x branch. Cherry picked from commit 68cdbc90c4fabd87ec8fecca4bdd753a55994107.
Check List
[x] New functionality includes testing.
[x] All tests pass
[x] New functionality has been documented.
[x] New functionality has javadoc added
[x] Commits are signed as per the DCO using --signoff
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 #697 to 2.x branch. Cherry picked from commit 68cdbc90c4fabd87ec8fecca4bdd753a55994107.
Check List
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.