LPS-44954 Simplify logic
LPS-44954
LPS-44954 Should be warn? minor SF