LPS-22792 SF - avoid even more duplicated code