Speed up some FEC handler queries
Merge branch 'master' into dc_cf