Merge branch 'fix/cache-control-headers' into 'develop'