merge in master-release history after reset to fca1b54031a1ba2a3c82bbbbe71716cd7e6a61d7