fixed last commit: flag sizes vary
Merge branch 'master' into next