Merge branch 'bc/xdiffnl'