Merge ponder:doc/ips