Merge pull request #6688 from nupplaphil/preload_adapter_fix