EAGLESIX-2651: Add: better sync w/ 2.6.5 code and tests