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