Strings for timeline upgrade, closes #1351