Merge luna changes
19 files changed