I made this change in the `shared` branch, which will be the next PR after `testing-framework`.