[DF-185] Fixed issue with merge