Should this be ported to bipy too (not necessarily in this PR)?