Merge change 24034 into eclair

* changes:
  Improve error message for unknown struct members