blocked notification page has been simplified
Merge remote-tracking branch 'upstream/master'