Merge "Revert "Fix wrong order of sample data text""