LPS-40421

See comments below.