LPS-31950 changes explained in pull #8961