Merge branch 'gh-132/static-libs' into v1.x