Commit on behalf of Didier