Merge branch 'check-flag-avoid-semicolon' into release
Merge branch 'release'