OC-4235: 'delay-loading' changes to reduce load-time (Mohit Sethi)