Redone without using indexes

 - merge master
 - remove index changes
 - add Symlinker