Merge "Added data service configuration support"