eedrummer Merge pull request #1402 from synthetichealth/flexporter_qicorenotdone