Merge change 22352 into eclair

* changes:
  Fix FallRS by keeping a reference to the mesh.