Merge "[RONs] Clean EnRouteStyle" into main