Merge pull request #1130 from TheBlueMatt/2021-10-mon-fail-after-conf