Your comments

This is the kind of thing I'm referring to, I want to rebase these branches to upstream/master, taking all three along in the one go.

Image 922