Merge "Adding new parameters for OSCC CI job"