Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev