Merge "Fix the build." into klp-dev