Merge "DO NOT MERGE fix build" into klp-dev