Bug 847473 - Lazy load additional resources