DF-3435 fixes after review
DF-3435 fixes after review