[DF-2560] Main changes.