prepare for next dev iteration
Merge branch 'updateDependencies' into 1.7.x
Merge remote-tracking branch 'origin/1.7.x' into 1.7.x
fix resource change detection bug
fix merge conflicts