merge in master-release history after reset to ea09e6bddba6b968fbf1ee0264aa18bd7bbe7e80