[Bug 225684] Merge Review: devhelp (stalled)