Merge "Added data consistency check for single source"