Port other changes to 1.2-dev