Merge "Remove incorrect warning." into klp-dev