merge with reillusion commit