Merge branch 'service-worker-allowed-header' into 'develop'