merge 45785 45784 45786 45787