LPS-47737 Make sure tests cover this issue