Merge branch 'dev'
Stripping resource path if it contains /