Merge "Fix "return 0" behavior in rs 0 was not properly blocking for the next message."