I just noticed this didn't make it into the 5.18 queue. Which is abit sad as it leaves us with a rather inconsistent bio API in 5.18.