force override when concat files
Merge branch 'develop' into patch-1