@ kalbermattenm : kept this for the moment as I'm not completely sure it's not needed anymore...