typo in usage
usage corrected [-f|-s]
make clear it is a draft from v2.x branch
Merge remote-tracking branch 'origin/v2.x' into v3.x