Merge "Suppress Notifications for Hidden Subs" into main