* Clean trigger functions
* First commit to try to fix #729700
* Second commit to try to fix #729700