Several updates.
Merge remote-tracking branch 'alliance/master'

* alliance/master:
  Several updates.