1. Improved announcement notification handling
2. Minor improvements
SHA1: e98cb3d12b60194d747686ccb83a1173a88ed2a2
SHA256: 54033ab7534caa3815dd99d61de599483317ed9ef0fd2312e6a54cc31fe659d9
SHA3-512: 211d73dda01478fa0a58d10d9fd8838bf97d22b348d0a396dcc310b6d3ad3a687be7210abcd141323a629a36b98f938eb71ace166a51e56f8dce5d308710cff6