Merge pull request #1676 from Kenneth-T-Moore/fd

Fixes for the scalable problem in CO and MDF
working;