Re #6771 Cleaning up loaders. Use loadhelper instead.
Merge branch 'feature/6771_ILL_D33' into develop