Patches preload issue OOIION-1344
Merge pull request #1385 from seman/preloader_rebase

Patches preload issue OOIION-1344
Merge remote-tracking branch 'upstream/master'