Merge branch 'lib' into wip