It seems that upstream did not merge it yet. Any issue preventing the merge? It would be great to have it upstream for 2021.10 (we are at -rc3 already).