merged in 1.65-test-rundat branch