Merge "Add additional checks for invalid parameters" into oc-dev