Merge branch 'hotfix/fe-layout'
Merge branch 'develop'
Begin with SqlAlchemy