Change TTL and code reviews
Merge branch 'dev-bugfix'