merging from icto