DF-4306 fixes after review