[DF-1263] and [DF-1264] re-fixed.