Merge Multiple accounts

Merge the multiple accounts code with master