Revert "Sync to tpl of 1.6.0.8 + table colspan fix"

This reverts commit 8b95a250e4a14100c8749a0d98d6331a732b8bbe.