merge in master-release history after reset to 370a26efa61d83e7d479399d8b0976c9199b8777