Merge branch 'dev'
Added dependency on patrisika-scopes
Merge branch 'master' into dev