merge in master-release history after reset to 68ab8f865046400e071ce4d59259f28d6b2360e4