Only add scales to image like contents
Increased request timeout
Merge branch 'master' into testing