Merge pull request #7306 from kmitchel/dyn_flt_osd