Updating for release 2.12