Merge luna changes