Change Details

I've only compile-tested so far. I don't see any regression tests for this feature, so I will write some basic ones.