Merge the easy part of the IOP branch