hot fix
Merge branch 'hotfix/fix_sql_error_in_feedback' into develop