Merge "Fixed method name casing and IDEA warnings in FileRepo"