EAGLESIX-2651: Object: sync w/ 2.6.5 code; fix tests