Comment 13 for bug 1818752

@Wayne,
I'll commit my fix soon (tomorrow for me).

The new thermal shape calculation just need refinements to generate a good shape.