LPS-32400 - Add conversion for conditions in different cases