Revise conditional branch for all-flag
Merge branch 'master' into mac