WIP: CA-145177: SM: Investigate locking issues