Merge branch 't/uptime_cleanup'