merge from genify nej