Merge "Fix inconsistent system routing permission check" into main