Merge "Add validation check for divergent parameter definitions"