handle corner case of trigger Action null
Merge remote-tracking branch 'origin-richk/master'