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