LPS-39247 Apply to KB