merge in master-release history after reset to bda8dcdf5afe544cc26f44cb0418f73dcf98a880