Merge branch 'remove-linker-scheme-option' into 'develop'