Merge "Xpath to NodeId invalid"