Merge "Remove misleading warnings." into klp-modular-dev