Merge "BugFix: Config TTL" into pi-dev