Merge "Fix iOS conversion script"