Closed bnmnetp closed 2 years ago
Addresses much of #1946 and #1947
This looks fine based on a quick glance -- thanks for working on it!