Updated to 1.2.0-cr7