Merge "Add ServiceData to hidden params"