Merge branch 'hotfix/technologyAndOrdersBugfixes'
DF Some fixes in sql.
Merge branch 'hotfix/sql' into dev