merge in master-release history after reset to 6e048afb4bcac4118b09cc0dd01f0ca2a797a95a