suppression bootstrap 2.0
Merge branch 'Vincent' into dev