changeset from branch "new-image-optimization"