Edit KP150, create KP157
Merge branch 'test' into dev