Merge NCIP with LexEVS fork.