Issue #3567179: Resolve merge conflicts after rebasing on 2.0.x

Closes #3567179

Merge request reports

Loading