Please merge my changes upstream

Merge my last commits so that we can pass this version to QA.