Merge branch 'fix-escort-sharrow' into preview #677

Job	Run time
linux-64-py3.10	4m 57s
prototype_mtc	49m 23s
macOS	10m 3s
prototype_mtc	49m 2s
prototype_psrc_in_development	3m 45s
estimation_mode_test	15m 28s
win-64	11m 7s
prototype_arc	53m 35s
placeholder_psrc	40m 29s
random_seed_generation_test	2m 24s
prototype_marin	1m 32s
develop-docbuild	0s
prototype_mtc_extended	3h 15m 38s
placeholder_sandag	2h 27m 9s
prototype_sandag_xborder	5m 13s
production_semcog	5m 25s
prototype_mwcog	48m 58s
placeholder_multiple_zone	7m 51s
	10h 51m 59s

Provide feedback