merge in master-release history after reset to 999bc211ddf5bb9640509dab5731a7e45cb28d5b