Start work on using contact info tables
Merge remote-tracking branch 'origin/feat/registration-types-tests' into feat/registration-types-tests