[3.12] GH-121970: Extract changes into a new extension (GH-129105)

[3.12] GH-121970: Extract changes into a new extension (GH-129105) #139060