on going merge with td renderer fix