fix #2458 - add support for WAITAOF
#2536
+43
−1
Open
WAITAOF
#2536