I would estimate another 6 months, so I'll make it conditional.

Should I add a patch on the same branch, or amend this patch?