merge 44728 44730