Merged "Base Notification" Upstream changes with my own.