[Bug 226359] Merge Review: rdist