OSNG-1 removed exceptions
Merge branch 'master' of github.com:osiam-dev/osiam