Merge change 22169 into eclair

* changes:
  Cleanup the Galaxy, add a few RS functions for Grass.