Merge branch 'noc-1096' into 'master'

#1096 Fix correlator trigger handler call.

See merge request !3097

(cherry picked from commit c467022b)

aa456ba6 Fix correlator trigger handler call.