Remove some redundant warning suppression
Merge branch 'master' into roles