Version 12.0

Previous pull request contained a couple commits for version 12.0.