MAP-5800: WIP
WIP for gauge handling.
Conflict resolution.
WIP
Added Arc Gauges.