My read is that #6044 was pretty safe. but there are no tests. #6197 should be small, but needs to be reworked, also, no tests. Maybe it makes sense to rebase #6197 onto #6044, or make some combination of them, and then it’ll be ready to go when #6170 is viable?