Merge "Preload2: Fix dependencies"