Merging changes to icto repo