[DF-1252] and [DF-1253] hotfix.