Import GENIE from svn r3926