#2231 was merged to enabled depending PRs to be further worked, but there are some improvements raised by later reviews that should be addressed, probably the most important being the need for extending the UTs.