Protect FlexiLoader against no HE
Merge pull request #2624 from bsunanda/Phase2-HE24

Protect FlexiLoader against no HE