[DF-1608] and [DF-1609] fixed.