merged with latest v1.62