Merge "Prevent overflow of unsigned variable" into sc-dev