LPS-31985 Refine solution provided by LPS-23365