Import schematic changes from master to v1.