Some fixes from 2.2.6 got lost during merge
Removed flag notice from language files
Merge branch 'hotfix/2.2.7'