Merge "Remove unused variable" into tm-dev