Merge "Remove unnecessary padding code" into tm-dev