down merge from novus