issue6291: resolve some merge conflicts after 35e4bc7