Merge change 21926 into eclair

* changes:
  Move the sky