Merge "Change TOC and TOE to long" into tm-dev