Additional ION reverts and merge fixes