SCISOFT NCD: SCI-1605 add support for water reference