merge in master-release history after reset to 2e30b21bf07637a531ad63f6b45dd63c9b104c51