K2S: added two wait patterns.
Merged #495