Revert "Revert "Thierry Test commit""

This reverts commit d9df0cd90aac5f344ae237adf2a303c150f8d4bc.