New SQL model in solib.sql
Merge branch 'develop'