Make sure the non-blocking status is consistent
Authored by: artyom-beilis 2015-11-22
Parent: [r2325]
Child: [r2327]