Fixes: #18599 (cherry picked from commit feac9a1d)
mentioned in commit a9e62556
mentioned in commit 7f143dad