ABS datasource
merged changes in