8fc05199d6
Merge commit 'ab66ed2e067cbd1bc415b6cf66f3b5191b166461' * commit 'ab66ed2e067cbd1bc415b6cf66f3b5191b166461': This variable can be checked outside the lock because it's only