Fixed #1173: Bug - Possible race conditions in request manager
CS fixes
(cherry picked from commit b64adf6)
(cherry picked from commit 42c31c7)