Merge branch 'hotfix/1.2.1'
Merge branch 'release/v1.2.1'
imagesloaded
merge conflict
reallow cache flushing in production
Merge branch 'hotfix/reallow-cache-flush' into development