f1 added
f2 added
f3 added
Merge branch 'feature/SW_100' into develop