Merge change 24058 into eclair

* changes:
  Minor perf improvement to fall and expand use of struct.