LPS-52318 unify code