Merged with v1.61