merge changes of new IXSI version