added will dismiss and will cancel block
Merge branch 'dismiss-block'