merge in master-release history after reset to ea779163321dca33eddde61749c34eed4833883e