[ ] All tests pass, including unit test, integration test and doctest
[ ] New functionality has been documented.
[ ] New functionality has javadoc added
[ ] New functionality has user manual doc added
[ ] Commits are signed 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
Manual backport of #1868 to 2.x
Issues Resolved
N/A
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.