Changes for 2.2.0-beta2