Merge branch 'add-resources'
Merge branch 'master' into add-resources