Merge "Preparing for account refactoring"