Merge branch 'exposed-background-image' into 'develop'