Feature/687 more tdtm triggers

Fix for 687.