Merge "Remove unnecessary updatePivots" into tm-dev