Merge branch 'fix/link-headers' into 'develop'