V2.1.1 dev

Yann Garciarequested to merge
v2.1.1-dev into master

Closing TTF T012

Merge request reports