[DF-5597] Fixed errors after merge with development