Fixes: #16758 (cherry picked from commit 1f894e68) (cherry picked from commit 7355ac96)
mentioned in commit d8ade6cd
mentioned in commit d411a4d6