Revert "Revert "issue-491: Significant performance improvement for spin lock contention""

This reverts commit fc7127daf969efa5205a5fc3aed3c6d255f12e5d.
Revert "Revert "Revert "issue-491: Significant performance improvement for spin lock contention"""

This reverts commit 534eb54fe5e868082963c214fe0e89971bb19fae.
Revert "Revert "Revert "Revert "issue-491: Significant performance improvement for spin lock contention""""

This reverts commit 9c1545b5fd383e2b996bc7a7e5f0ef2f07b47697.