Commit 27/10 - Thales