6345 alert rework

Merged Benjamin Baer requested to merge 6345_AlertRework into master

Fixed #6345

Merge request reports