open #869 - This should be cherry-picked into main branches as well. (cherry picked from commit 4c97413)
4c97413