Added feature à la bourre "n2"
Hotfix 1
Merge commit '8128495406a7288f12cd59fad83825f23151800a' into release/Release-2.0