Fix RepoHandler
Merge branch 'fix-handler' into in-use