Updates to support parent accounts
Merge with upstream