Merge "Added csit tests for StndDefined disabled validation"