Merge "Local account handling cleanup"