Refine handling of before and after triggers
Refine handling of before and after triggers

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus