Merge "Fix build" into klp-dev