[Bug 226422] Merge Review: slrn