DDF-614: Updated various items per code review