LPS-45630 Apply to KB