fix-recent-regressions will be merged into develop before the security patches are merged into develop. There is not a way around this, as the only thing that resolves a bunch of merge conflicts is in that branch. I'd like to ask the community as a whole to stop running unstable branches of our software as we can't properly support them.
