Support for multiple homes
Merge remote-tracking branch 'origin/dao_refactor' into dao_refactor