LPS-50827 Edit Breaking Change - 2