watch: imported to new branch
Merge branch 'watch-only' into toaster