merge in master-release history after reset to 7b9347a7f9d870e149ef38438ad547abe2709ee2