Final version used for HIG-17-026.