* add folder uid scope resolver * undo guardian change, move it to a separate PR * fix test + linting