Merge branch 'chores/add_more_sample_data'