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