Updates related to 1.2