Merge "Account refactoring follow-up"