Fix issue with long operations blocking OMS (OMS-177)