[DF-798] and [DF-827] fix and feature implemenation.