DDF-846: Add code changes per code review comments