Patches preload issue OOIION-1344

@jamie-cyber1 Please review and merge