Eluna fix core merge