merge 3.1 (#12221)