Merge change 5243 into donut

* changes:
  Only report "unknown metadata" once per restore helper