Merge "Extend and document the "wait" command"