Merge branch 'release/0.6.1' into develop
Fix reloading after user resource execution
Bump to 0.6.2
Merge branch 'release/0.6.2'