Prepare for release

Also, merged some production fixes from the
parent commercial project.
Merge branch 'release/1.0.0'