Merge Luna changes
13 files changed