EAGLESIX-2651: Mod: sync w/ 2.6.5 code, fix tests