RealDelete
Merge remote-tracking branch 'origin/Sprint-5' into small-fixes