I13I - define metadata so that adding NXTomo works
Merge remote-tracking branch 'origin/8.36' into 8.39