Merge branch 'revert/cache-control' into 'develop'