In general I will just cherry-pick your PR changes against master back into 5.0. If it applies cleanly, no worries; if it doesn't then I might ask for help with another PR.