Merge branch 'hotfix/dae_error_500' into dev