Several changes for release 1.2