Merge change 1668 into donut

* changes:
  Document exception from parse3339