Merged "Database_fixes" into "Dev"