(cherry picked from commit 43a43a33)
mentioned in issue #16704 (closed)
mentioned in merge request !736 (closed)