merge in master-release history after reset to f98bce8f5870e94d9be50c2569deecddec174559