delay loading overrides
fix js errors
Merge pull request #1 from fheng/7454-delay-loading-overrides

delay loading overrides