merge from fork in NeXus definitions