This is a tracking bug for upstream bugfixes that we can cherrypick now that 2.2 is forked. Add such bugs to the "depends on" field. Then when actually cherry-picking them, clone them to track them into 2.2 and remove them from the "depends on" field.