Merge "Moves clear data out of commit"