Fixes #7279
Merge pull request #7281 from mwerezak/nukeops-airlock

Fixes #7279