telebaton storage
stupid compile errors
Merge pull request #5109 from paprka/telebatonstorage

Telebaton storage tweak