Merge "Clarify the behavior about event and property triggers"