Only add scales to image like contents
Merge branch 'master' into experimental-image-display