Merge "More thorough check for expensive rendering" into tm-dev