HUM-459 Fixed race condition
HUM-459 Fixed race condition

redbo/hummingbird,creiht/hummingbird,nadeemsyed/hummingbird,troubling/hummingbird,corystone/hummingbird,creiht/hummingbird,troubling/hummingbird,redbo/hummingbird,nadeemsyed/hummingbird,corystone/hummingbird