Merge "Refactoring of the prototype data app"