This work is already in 3.3.0 because the upstream work was merged into master prior to the branching.