LP#1719726: Baseline trigger definition consistency