Lunex code merge with local changes