Basically, it's shuffling around the notifications stuff. This commit sponsored by Günter Kraft. Thank you!