Merge remote branch 'origin/feature/6929_use_sancas_v1_1'
Merge remote branch 'origin/bugfix/7350_doxygen_errors'
Re #7360 Fix problem with output files
Re #7360 Fix problem with output files