Merge "Use 'ip link' to prevent permission errors in non-root environments" into main