LPS-31107 Apply (reverse-merged from commit 7ba0837462b88397781a713cf5fb81885f5ffdf7)