Apply upstream patch for EC calculation bug and bump version addendum.