resert database
Merge branch 'master' into t15_tests_update_and_fixes