LPS-34296 Apply changes