Protect FlexiLoader against no HE
Merged Phase2-HE24 from repository bsunanda
Correct numbering