Fix path util to return dist paths in tests
Reindex files with manual virtual file and index refresh
Buildserver auto merge