#17452 initial extension commit