LPS-39735

Hi Brian,

this is the second part of #13753.

Thank you.