Sync after 1.2 merge