Improve locking by using reacquire_until_clear (OMS-497)