[DF-3489] work in progress