Merge pull request #3020 from akoeplinger/fix-ttl