Change Details

I did some manual testing, and wrote some regression test cases which would have uncovered the bugs: https://reviews.freebsd.org/D40269