Merge branch 'img-src-blob' into 'develop'