Various cleanups and bump the version
Resolve merge