[KK] Added feature 2
Merge branch 'feature2'