[Bug 226537] Merge Review: werken-xpath