Semi-automatic GitLab's rebase didn't work out well for this use case.
mentioned in merge request !1372 (merged)