Merge pull request #2528 from arik-so/arik/2023-08-2470-shorter-term-monitor-locks