LPS-32713
LPS-25730 Apply new pattern