Merge "Manual link addition feature assumes Long for Switch identifier and Short...