merge in master-release history after reset to 6aad68aea028eaa049454764867daccdaf67fc54