EAGLESIX-2651: Let: better sync w/ 2.6.5 code, fix tests to match new code