[DF-4558] Main changes.