Update extra-enforcer-rules
Merge branch 'update-extra-enforcer-rules' into integration/master