Merged to v1.63