Sync trunk r1685