Uses RouteMacher
Merge remote-tracking branch 'origin/master'
Start IndexDatabase refactoring