TBD-1186 fixed: Remove the output folder if it already exists
Merge branch 'maintenance/5.6'