Rebased to m-i 41f6469b5218, Sep 8