[DF-3732] small refactor
[DF-185] merge