fix(core): Allow waking the same message between waits ( #3475 )

fix(core): Allow waking the same message between waits ( #3475 ) #155