Merge "StndDefined event routing"