Bring v0.38.x to the up-to-date status of main (#93)

Bring v0.38.x to the up-to-date status of main (#93) #305