[DF-3613][DF-3614][DF-3615] fixes for review