[MOD] Delete collection - set flag
Merge remote-tracking branch 'origin/sprint5' into sprint7