Closes #11312 See the original issue before cherry pick (cherry picked from commit 990ad000f8e869e55353e6531d9e38f23104bcd6)