Merge branch 'hotfix/comparaison_clear_id'