This MR improves the branching pipeline, it's based on !215 (merged) but excluding commits still in discussion.