DF-291 DF-1367 DF-1368 review fixes