Fixes: #16758 (cherry picked from commit 1f894e68) (cherry picked from commit 7355ac96) (cherry picked from commit 52634dad) (cherry picked from commit d411a4d6)