LPS-51303 Apply changes