LPS-40858

@rotty3000 is aware of this