Merge "Fix robot preload"