Davidson-Souza WIP: Rework block notification (#92)