Merge change 22014 into eclair

* changes:
  Improved performance in Galaxy and Fall