add rule exceptions
Merge branch 'master' into develop