fixes: #16794 (cherry picked from commit 0f3e4bb9)
mentioned in merge request !77097 (closed)
mentioned in issue #16700 (closed)