merged with latest v1.63