Temporary fix for ZAS processing twice per time interval.
Merge pull request #3638 from SkyMarshal/patch-1

Temporary fix for ZAS processing twice per time interval.
Merge remote-tracking branch 'bay12/master'
Updated merge notes & recompiled.
Merge remote-tracking branch 'origin/master' into main-server