Cleanup.
Merge branch 'test' into dev
Library bump.