Support DCF 3.0+ and 2.0

Merged Jeff Sturek requested to merge JSTUREK8/UNL_Search:dcf-3.0-fixes into master

Merge request reports