Merge branch 'update/resources'