Merge "Add database name into ID of init queries"