Merge change 21750 into eclair

* changes:
  Tweak the galaxy