Merge "Adding default values, new parameter for cvp-sanity"