wip/T10832-generalised-injectivity