merged with latest 1.63