LPS-50604 Breaking Change