I've asked @couzteau to test this branch for a fix for his issue #6474