Merge 3.6 (fix #29519)