changeset from branch "new-image-optimization"
Merge branch 'master' into testing