CW-520 Allow manual overwrite on the cover image
Merge branch 'release-R1-bugfix-S4' into develop