@Marco or @Olivier Sprangers: do you think we could merge this PR? It is not urgen but Jan keeps writing to me.