Merge "Use <fqname> to avoid conflicts"