Merge "Fix SqlAlchemy version upgrade issue"