Backported notice fix from master