[merge] Fix alembic history / diversion.