testing step6, also the drop_mode
Merge branch '166-add-discard-mode' into develop