[PATCH 0/2] Fix two bugs CB_NOTIFY_LOCK failing to wake a water