EAGLESIX-2651: Or: better sync w/ 2.6.5 code and tests (code was just reorganizing)