Closes #1041 See merge request !853 Changelog: bug Issue: #1041
mentioned in merge request !861 (merged)