Merge "Fix issue: 2413494: Add TTY support." into eclair