[DF-3306] Fixed all related issues.