Added test6
Added test6-2
Merge branch 'feature/test6' into develop