Merge branch 'jc/test-lib-source-build-options-early'