Merge changes before workshop 22-02 A'dam