HHH-7841 - Redesign Loader
HHH-7841 - Redesign Loader