Improve speedup of local page loading
Merge branch 'ncl'