Issue 0266 Add recent changes from master to XT.Data.