UBERF-7690: Trigger improvements

[haiodo]

UBERF-7690: Trigger improvements

_{Huly®: UBERF-7891}