merge in master-release history after reset to 2f9a3e73bfd9f51b8e08b16b0bfdea33efeaa89d