Latest working code for integration testing
Merge remote-tracking branch 'origin/homestead-multiple-public-IDs' into homestead-multiple-public-IDs