Merge "Delete database file on downgrade" into tm-dev