Merge pull request #6790 from remitamine/tele13