File Lookup +  vault clean branch

rebased branch and pushed again but it doesn't seem to have been picked up in #8110