merged in latest fixes from v1.61