Merge "Data profile refactoring"