[20.09] trigger: 0.6.6 -> 0.6.6.1 #100492
(cherry picked from commit f85e2e1)
Motivation for this change
Apparently I forgot to hit submit.
I know that a lot of these changes are already in master, please make a new PR against master with the changes and cherry-pick those two commits into this PR please.