and how to prevent table-name truncation Thanks russellm & timo for discussion, and timo for review. Backported from master 317040a7