Merge branch 'develop'
CEP-697 fix for temporary images on news items
Merge branch 'hotfix/CEP-697' into develop