Merge pull request #6600 from annando/false-notifications