Merge ips' changes.