[DF-1568] Framework fix.