Merge "Revert "SEBA-357: remove deprecated uplink field""