Merge "Refactor onInsert trigger interface" into tm-dev