Add alias for cmd.watch (from cmd.wait) state, Fix #8612

Fixes #8612