Closes #1561 Merge request !985
mentioned in commit 124daec8
mentioned in commit e3e75628
mentioned in commit b6631e36