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

PR to route bugfix/REL-2133 into develop.