Merge branch 'hotfix/fix_sql_error_in_feedback'
fix introduced bug (showifs)
Merge branch 'hotfix/broke_something_when_trying_to_economise_showif' into develop