Merge "[SB Refactor] Support all possible data connection ints." into tm-qpr-dev