Port 9376 See merge request !1466
mentioned in commit 7e2df8c5
mentioned in merge request !1474 (merged)
mentioned in commit 2eb43c40