merge 3.5 (#1703178)