[DF-1234] is fixed - merged to development_qa branch.