initial merge from DataViva