Merge 3.6 (test_regrtest)