@sebastienros please port the 1.0/1.1 patch to the 2.0 patch branch.
@sebastienros please port the 1.0/1.1 patch to the 2.0 patch branch.