Merging the AllOptix branch into the SCI origin