DATA-1358 Follow-up on references.