Merge changes from Luna
34 files changed