Ordinary merge of the #8316 residency lock fix. Regenerated omo-task.js and omo-member.js on linux/amd64 with bun 1.4.2 via the NODE runner.
