Thanks Florian Apolloner for the review and implementation idea.
Co-Authored-By: Xavier Fernandez <xavier.fernandez@polyconseil.fr>