merge from luna