LPS-36379 SF - reorder logic