Merge pull request #1859 from TheBlueMatt/2022-11-rm-redundant-holding-cell-wipe