[DF-4712] work in progress