fix sqlalchemy regression
Merge remote-tracking branch 'arskom/2_9' into 2_9