Merge branch 'bug92-xop'