Merge "Fixing build break" into klp-dev