[SD-1240] Delete stage error handling
Merge remote-tracking branch 'tolga/master'