add deleted flag
add deleted flag
Merge remote-tracking branch 'origin/devel' into devel