merged with v1.65