Merge pull request #1401 from TheBlueMatt/2022-02-0conf-round-two