merged from master

2 jobs for !381 with additional-attributes-in-delete-event in 100 minutes and 34 seconds
latest merge request