merge in master-release history after reset to ec0df8cc31f6aa86c32bd3c24ba94a8a068f9242