Fixed the trigger issues
Merge branch 'feature-db-triggers-fixed' into develop