LPS-25730 Apply new pattern
LPS-25730 Backwards compat