Additional implementation and fixes for the locking feature (OMS-401)