[NA] f1

Reviewed by NA
[NA] f2

Reviewed by NA
Merge branch 'feature/feature2' into develop

Conflicts:
	madhu.txt

Reviewed by NA