Merge "Add annotation in CSTest to set flag values before instantiating CS" into main