Improvements for the trigger handling on orgs.
Merge branch 'test' into dev