Resolver role
Merge branch 'dev'