• Added additional support for complicated geometry operations to avoid some situations with overlapping Idle fields (#15206)