Merge "Introduced UserDataPreparer class"