Merge 3.5 (fix #29519)