Merge branch 'master' into split-library