merge 44914 44964