Update to 1.2-beta7