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