Merge "[NS13] Remove the last usage of the legacy int" into sc-dev