Merge latest round of Luna changes.
14 files changed