Merge "CSITs for StndDefined event routing"