LPS-48582 SF - reuse logic when possible