merge in master-release history after reset to edc702c7d6d44222a30fad5492aca916d48f0da2