Merge branch 'develop'
test resources manager 0
Merge branch 'master' into develop