Patches preload issue OOIION-1344
Merge pull request #1386 from seman/preloader_rebase2

Patches preload issue OOIION-1344