[Bug 226665] New: Merge Review: yp-tools