Merge "Fixed various FileBackendDBRepoWrapper errors found in IDE"