re #9686 Adjust to hadle lazy loading & perform stress test