Revise conditional branch for all-flag
Merge master