Merge "Fix ubsan divide by zero warning in ransac" into nextgenv2