Merge changes from Luna
65 files changed