Cleanup and fixed store_t::reset_data()
Merge branch 'daniel_2530' into v1.13.x