Add test KP
Merge branch 'hot_fix'