0214: stop at next trigger now includes fill triggers
#451
[Delivers #83613974]