Rename keepalive to ticker
Merge remote-tracking branch 'origin/dashboard' into dashboard