(cherry picked from commit 7a1bb33f293296e9aa51690ac57db63c74781afa)
mentioned in merge request !1671 (closed)