[DF-1568] and [DF-1627] fixed.