Merge "Bugfix: remove test.dbf file in recovery script"