Merge "Revise database initialization."