changes on the lhs fork

We can't move mentars repo to the lhs one while the lhs one has a fork.

So merge these changes, then we can delete the lhs fork, and then we can move the repo from mentar to lhs...