Merge pull request #3038 from TheBlueMatt/2024-05-no-dir-with-on-side-offline