Merge "Show comment not as block in tables"