Merge branch 'hotfix/SQL_query_fix'
statement downloaded
Merge branch 'hotfix/download' into develop