Merge change 21660 into eclair

* changes:
  Optimized Galaxy