Merge pull request #4173 from drizzle-team/beta