Merged fork in v1.65