first merge from NJ7