[Bug 226321] Merge Review: psgml