Fixed order tokens in reset_data()
Merge branch 'daniel_2329' into daniel_2329_nover