Merge branch 'local-library-split' into local-trunk