merged back changes from v1.70, from ad3f2 and 7cb6cc on 12-11 in run:test