[DF-555] issue is fixed - more changes.