BZR-02967

BZR-02967