[Bug 226359] New: Merge Review: rdist