DF-4225 fixes on review