LPS-47045 another commit