LPS-41931 Apply changes