DATA-1486 Follow-up work.