(cherry picked from commit c6c51639)
mentioned in commit 03735427
mentioned in merge request !1956 (merged)