LPS-43945 SF - avoid boolean parameters and make method more reusable