DF-3454 DF-3512 DF-3513 fixes for review