fix LPS-48582
LPS-48582 SF - return early if possible
LPS-48582 SF - reuse logic when possible
LPS-48582 Rename
LPS-48582 Move
LPS-48582 SF
LPS-48582 SF