LPS-36216-2

Second part. Will send the test after this gets in.

cc @mhan810