Merge "Fixed a crash with HUN notifications"