LPS-50348 Breaking Change