Agreed. Better to merge this as soon as possible and update driver test suite to use it and then return with updates in separate PR.