[Global] Clean output folder
Merge branch '1.6'