merge in master-release history after reset to c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e