Follow-up work DATA-1369