Merge "Introduced AccountDb API replacing helpers"