Merge "Add accessors for all addresses and clarify compare* methods"