SqlAlchemy - almost completed
Merge branch 'release/1.6'