LPS-43694 SF - avoid code duplication