In master this could be using the R5 API