Merge "Remove unnecessary padding code" into sc-dev