Initial commit for SOKP Build
Merge remote-tracking branch 'upstream/sokp-443' into sokp-443