Merge "Removing local image lookup from load_buf"