Updated to next snapshot
Fixed ttl code that was broken in custom branch
Merged ttl fix