Merge pull request #3776 from nabinhait/account_type

Propogate root type and report type into children based on parent