Merge pull request #1429 from TheBlueMatt/2022-04-drop-no-conn-possible