Turned into a MR, and got rid of minor conflicts for easier development.
8.x-2.x
7.x-1.x
changed target branch from 8.x-2.x to 7.x-1.x