Merge "Updates to tunnelxconn assignment"