The call

Merging changes for performance improvement when loading assets in vs plugin.