Merge pull request #6820 from JeroenED/bugfix/notification-order