[DF-1214] Major implementation.