GTNPORTAL-2852 Clean up and improve bundle loading process