Triggers fixes.
Merge branch 'development' into index-views