LP#820006: Action trigger notices fixes