issue6291: resolve some merge conflicts after 9907198