Merge branch 'feature/static-headers' into 'develop'