Maintenance update for 1.2 release