Delete improvements: fixes #1317, Closes #1317 See merge request !510
mentioned in merge request !474 (merged)