REL-2133: Make corrected patrol field an Option[PatrolField]