EAGLESIX-2651: And: better sync w/ 2.6.5 code