Clean up.
Bump version.
Merge branch 'ospalh-special-develop' into ospalh-special