Merge "Add ServiceCallHelper" into main