The source project of this merge request has been removed.
Adding a fix for RPC BI geometry that was somehow lost in master
This change was developed and included correctly in 21.3 but somehow it was not propagated to master. This merge is just to fix that.