fix so update resource does not run
fix tests
Merge branch 'master' into stable