Merge change 22024 into eclair

* changes:
  Micro-optimizations for FallRS