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