Follow-up work DATA-1388, DATA-1376.