LPS-46984 Breaking Change