Bring develop branch up-to-date with public updates

There is still improvements needed with the develop branch dealing with the address book linkage.