Ajout des flashbags
Merge origin/master