Merge "Fix build." into klp-modular-dev